merge with xen-unstable.hg
authorIsaku Yamahata <yamahata@valinux.co.jp>
Fri, 30 Jan 2009 01:54:13 +0000 (10:54 +0900)
committerIsaku Yamahata <yamahata@valinux.co.jp>
Fri, 30 Jan 2009 01:54:13 +0000 (10:54 +0900)

Trivial merge